From: Dirkjan Ochtman <dirkjan@ochtman.nl>
Date: Wed, 11 Apr 2018 22:49:56 +0000 (+0200)
Subject: Use relative dependencies inside cargo_rustc module
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~1^2~78^2~1
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=49a762f314bd2a039322d419e817edc4d9ab51b3;p=cargo.git

Use relative dependencies inside cargo_rustc module
---

diff --git a/src/cargo/ops/cargo_rustc/context/compilation_files.rs b/src/cargo/ops/cargo_rustc/context/compilation_files.rs
index db844bcce..95b5f6386 100644
--- a/src/cargo/ops/cargo_rustc/context/compilation_files.rs
+++ b/src/cargo/ops/cargo_rustc/context/compilation_files.rs
@@ -8,9 +8,7 @@ use std::sync::Arc;
 use lazycell::LazyCell;
 
 use core::{TargetKind, Workspace};
-use ops::cargo_rustc::layout::Layout;
-use ops::cargo_rustc::FileFlavor;
-use ops::{Context, Kind, Unit};
+use super::{Context, FileFlavor, Kind, Layout, Unit};
 use util::{self, CargoResult};
 
 #[derive(Clone, Hash, Eq, PartialEq, Ord, PartialOrd)]
diff --git a/src/cargo/ops/cargo_rustc/context/target_info.rs b/src/cargo/ops/cargo_rustc/context/target_info.rs
index 309783953..82d759692 100644
--- a/src/cargo/ops/cargo_rustc/context/target_info.rs
+++ b/src/cargo/ops/cargo_rustc/context/target_info.rs
@@ -6,7 +6,7 @@ use std::str::{self, FromStr};
 use super::{env_args, Context};
 use util::{CargoResult, CargoResultExt, Cfg, ProcessBuilder};
 use core::TargetKind;
-use ops::Kind;
+use super::Kind;
 
 #[derive(Clone, Default)]
 pub struct TargetInfo {
diff --git a/src/cargo/ops/cargo_rustc/context/unit_dependencies.rs b/src/cargo/ops/cargo_rustc/context/unit_dependencies.rs
index 2fe20cde0..d68037b55 100644
--- a/src/cargo/ops/cargo_rustc/context/unit_dependencies.rs
+++ b/src/cargo/ops/cargo_rustc/context/unit_dependencies.rs
@@ -15,11 +15,10 @@
 //! (for example, with and without tests), so we actually build a dependency
 //! graph of `Unit`s, which capture these properties.
 
-use ops::Unit;
+use super::{Context, Kind, Unit};
 use std::collections::HashMap;
 use CargoResult;
 use core::dependency::Kind as DepKind;
-use ops::{Context, Kind};
 use core::Target;
 use core::Profile;
 
diff --git a/src/cargo/ops/cargo_rustc/output_depinfo.rs b/src/cargo/ops/cargo_rustc/output_depinfo.rs
index 8edcd185f..dcdbb95f8 100644
--- a/src/cargo/ops/cargo_rustc/output_depinfo.rs
+++ b/src/cargo/ops/cargo_rustc/output_depinfo.rs
@@ -3,10 +3,9 @@ use std::io::{BufWriter, Write};
 use std::fs::File;
 use std::path::{Path, PathBuf};
 
-use ops::{Context, Unit};
+use super::{fingerprint, Context, Unit};
 use util::{internal, CargoResult};
 use util::paths;
-use ops::cargo_rustc::fingerprint;
 
 fn render_filename<P: AsRef<Path>>(path: P, basedir: Option<&str>) -> CargoResult<String> {
     let path = path.as_ref();